Alex Crichton [Fri, 20 May 2016 21:25:43 +0000 (14:25 -0700)]
Don't throw away errors with `-p` arguments
This was unfortunately ignoring errors which would helpfully tell you how to
rerun a command with a more precise specification.
Closes #2641
bors [Fri, 20 May 2016 21:09:55 +0000 (14:09 -0700)]
Auto merge of #2722 - alexcrichton:stderr-not-stdout, r=alexcrichton
Report status to stderr -- last few tests
Fixup of #2693 for the last few tests.
Alex Crichton [Fri, 20 May 2016 16:23:50 +0000 (09:23 -0700)]
Fix up last few remaining tests status-to-stderr
Alex Crichton [Fri, 20 May 2016 16:08:48 +0000 (09:08 -0700)]
Merge branch 'status-2-stderr' of https://github.com/matklad/cargo into stdout-not-stderr
Aleksey Kladov [Fri, 20 May 2016 14:19:49 +0000 (17:19 +0300)]
fix cargo_compile_path_deps
Aleksey Kladov [Fri, 20 May 2016 14:00:15 +0000 (17:00 +0300)]
fix test_cargo_publish
Aleksey Kladov [Fri, 20 May 2016 13:54:01 +0000 (16:54 +0300)]
fix test_cargo_freshness
Aleksey Kladov [Fri, 20 May 2016 13:39:58 +0000 (16:39 +0300)]
fix test_compile_git_deps
Aleksey Kladov [Fri, 20 May 2016 13:22:58 +0000 (16:22 +0300)]
fix some cargo_compile tests
Aleksey Kladov [Fri, 20 May 2016 12:02:09 +0000 (15:02 +0300)]
fix test_cargo_bench
Aleksey Kladov [Fri, 20 May 2016 11:47:39 +0000 (14:47 +0300)]
fix test_cargo_overrides
Aleksey Kladov [Fri, 20 May 2016 01:07:54 +0000 (04:07 +0300)]
one more regexp
Aleksey Kladov [Fri, 20 May 2016 00:52:13 +0000 (03:52 +0300)]
fix test_cargo_package
Aleksey Kladov [Fri, 20 May 2016 00:21:55 +0000 (03:21 +0300)]
fix test_cargo_registry
bors [Thu, 19 May 2016 22:00:03 +0000 (15:00 -0700)]
Auto merge of #2719 - semarie:test-git-vcs, r=alexcrichton
PR #1124 have replaced `git` with `vcs`
changes test_cargo_new::author_prefers_cargo to testing configuration
with `vcs`
Sébastien Marie [Thu, 19 May 2016 19:42:32 +0000 (21:42 +0200)]
PR #1124 have replaced `git` with `vcs`
changes test_cargo_new::author_prefers_cargo to testing configuration
with `vcs`
Aleksey Kladov [Thu, 19 May 2016 00:51:07 +0000 (03:51 +0300)]
more auto refactoring fixes
Aleksey Kladov [Thu, 19 May 2016 00:02:41 +0000 (03:02 +0300)]
fix more tests with auto refactoring
Aleksey Kladov [Wed, 18 May 2016 23:41:30 +0000 (02:41 +0300)]
more regexp fixes
Aleksey Kladov [Sun, 15 May 2016 22:16:54 +0000 (01:16 +0300)]
fix test_cargo_install
Aleksey Kladov [Sun, 15 May 2016 22:03:35 +0000 (01:03 +0300)]
fix exit_code tests
Aleksey Kladov [Sun, 15 May 2016 21:48:11 +0000 (00:48 +0300)]
fix more tests
Aleksey Kladov [Sun, 15 May 2016 21:26:24 +0000 (00:26 +0300)]
fix more test with insane regexes
Aleksey Kladov [Sun, 15 May 2016 21:17:56 +0000 (00:17 +0300)]
fix more tests with regex
Aleksey Kladov [Sun, 15 May 2016 21:07:04 +0000 (00:07 +0300)]
fix test_cargo_test
Aleksey Kladov [Sun, 15 May 2016 01:11:00 +0000 (04:11 +0300)]
fix some tests with IntelliJ-Rust automated refactoring
Aleksey Kladov [Sat, 14 May 2016 21:44:18 +0000 (00:44 +0300)]
fix some more tests with regexp
Aleksey Kladov [Sat, 14 May 2016 21:15:22 +0000 (00:15 +0300)]
fix a bunch of tests with regexp
Aleksey Kladov [Sat, 14 May 2016 21:00:00 +0000 (00:00 +0300)]
fix test_cargo_clean
Aleksey Kladov [Sat, 14 May 2016 20:53:49 +0000 (23:53 +0300)]
fix test_cargo_build_lib
Aleksey Kladov [Sat, 14 May 2016 20:49:39 +0000 (23:49 +0300)]
fix test_cargo_build_auth
Aleksey Kladov [Sat, 14 May 2016 20:31:11 +0000 (23:31 +0300)]
report status to stderr instead of stdout
bors [Wed, 18 May 2016 22:15:03 +0000 (15:15 -0700)]
Auto merge of #2710 - sbeckeriv:the-missing-lib, r=alexcrichton
The missing lib
Dearest Reviewer,
This pull request allows the value of project.links to be passed into
the build script via an environment variable. This closes #1220 . I have
added a test that makes sure that the environment variable is set. Also
note I am using CARGO_LIB not LIB because it appears to be used for
windows in appveyor. I think CARGO_LIB fits better.
I have also updated the documentation to reflect the new variable.
Thanks!
Becker
Stephen Becker IV [Tue, 17 May 2016 18:54:43 +0000 (11:54 -0700)]
The missing lib
Dearest Reviewer,
This pull request allows the value of project.links to be passed into
the build script via an environment variable. This closes #1220 . I have
added a test that makes sure that the environment variable is set. Also
note I am using CARGO_LIB not LIB because it appears to be used for
windows in appveyor. I think CARGO_LIB fits better.
I have also updated the documentation to reflect the new variable.
Thanks!
Becker
[Updated]
Github comments moved to CARGO_MANIFEST_LINKS
Fix if statement
bors [Wed, 18 May 2016 18:18:39 +0000 (11:18 -0700)]
Auto merge of #2703 - alexcrichton:target-dir-abs-path, r=alexcrichton
Fix relative `build.target-dir` configuration
Closes #2700
bors [Wed, 18 May 2016 17:08:25 +0000 (10:08 -0700)]
Auto merge of #2706 - alx741:extend_manpages, r=alexcrichton
Add man pages for cargo commands
So, the markdown port (#2672) is in idle, I'll be working in a way to make it without depending on external tools, but that is going to take a bit longer.
These are the **troff** pages for the rest of the cargo commands; previously the *cargo-build(1)* was added, so here are the rest.
No extra build dependencies here, just the new man pages.
bors [Wed, 18 May 2016 03:54:03 +0000 (20:54 -0700)]
Auto merge of #2688 - carols10cents:docs-refresh, r=alexcrichton
Docs refresh
Hi! Sooooo I've been thinking about the cargo docs lately and today I decided to try some of the things I've been thinking about.
There are some smaller changes in here, typos and clarifications and stuff, that I'm totally willing to break out into a separate PR(s) if yinz want.
My goals for the larger changes were:
- **Make one obvious place to go for info on every which way to specify a dependency.** I've found myself clicking around the different doc pages a lot to find the semver syntax, the different keys that can go with a git location, the `path` override syntax, etc. So I made one top-level "Specifying Dependencies" page and moved relevant info from the guide, the manifest page, and the crates.io page.
- **Make The Guide a bit more focused.** There were a few topics in there that didn't really fit in the story arc of trying to get someone up and running with cargo-- it veered off into some more advanced topics that I've moved to places I think they fit better.
- **Make the crates.io page only about publishing, not using and publishing.** The info about adding dependencies got folded into either the guide or the new specifying dependencies page, so this should close https://github.com/rust-lang/cargo/issues/1035.
I'm also thinking about having someone new to rust/cargo try following the guide, but wanted to get a first pass from experienced people :)
bors [Wed, 18 May 2016 02:09:43 +0000 (19:09 -0700)]
Auto merge of #2713 - sbeckeriv:fix-name-ordering, r=alexcrichton
Correct author order
Dearest Reviewer,
PR #2696 added some new checks for environment variables for author and
email. After the pull request was merged a comment was left about gits
ordering for looking at the variables. This pull request closes #2705 by
reordering the look up and also addeds CARGO_NAME and CARGO_EMAIL to the
top of the order.
Thanks
Becker
Stephen Becker IV [Tue, 17 May 2016 23:31:42 +0000 (16:31 -0700)]
Correct author order
Dearest Reviewer,
PR #2696 added some new checks for environment variables for author and
email. After the pull request was merged a comment was left about gits
ordering for looking at the variables. This pull request closes #2705 by
reordering the look up and also addeds CARGO_NAME and CARGO_EMAIL to the
top of the order.
Thanks
Becker
Carol (Nichols || Goulding) [Tue, 17 May 2016 23:08:24 +0000 (19:08 -0400)]
At the end, point to docs that might be interesting next
Carol (Nichols || Goulding) [Tue, 17 May 2016 22:48:35 +0000 (18:48 -0400)]
Add info about what's different between debug/release
Carol (Nichols || Goulding) [Tue, 17 May 2016 22:41:31 +0000 (18:41 -0400)]
Add info about `build-dependencies` to the specifying deps page
Carol (Nichols || Goulding) [Tue, 17 May 2016 22:33:27 +0000 (18:33 -0400)]
Add a `[dev-dependencies]` example
Carol (Nichols || Goulding) [Tue, 17 May 2016 22:33:13 +0000 (18:33 -0400)]
Correct typo when referring to 64 bit
bors [Tue, 17 May 2016 19:48:52 +0000 (12:48 -0700)]
Auto merge of #2707 - sbeckeriv:banned-list-2699, r=alexcrichton
Ban keywords from crate names
Dearest Reviewer,
This pull request extends the banned list of project names to include
all of the current keywords for rust. I got the list of keywords from
https://doc.rust-lang.org/grammar.html#keywords . This
closes #2699 . The original ticket said warn but I figured how test is
handled is most likely how all banned names should be handled.
Oddly enough a few keywords have made their way to the crates.io. fn and
proc are both examples I found spot checking keywords. I do not there is
any action to take on those crates.
Thanks
Becker
Stephen Becker IV [Tue, 17 May 2016 05:37:05 +0000 (22:37 -0700)]
Ban keywords from crate names
Dearest Reviewer,
This pull request extends the banned list of project names to include
all of the current keywords for rust. I got the list of keywords from
https://doc.rust-lang.org/grammar.html#keywords . This
closes #2699 . The original ticket said warn but I figured how test is
handled is most likely how all banned names should be handled.
Oddly enough a few keywords have made their way to the crates.io. fn and
proc are both examples I found spot checking keywords. I do not there is
any action to take on those crates.
Thanks
Becker
bors [Tue, 17 May 2016 16:00:28 +0000 (09:00 -0700)]
Auto merge of #2685 - mkroman:master, r=alexcrichton
Fix `cargo test --doc` not testing examples
When running cargo doc --test in a project folder, cargo does not test documentation examples, it only builds the project and exits.
Refer to issue #2684
Mikkel Kroman [Tue, 17 May 2016 13:08:29 +0000 (15:08 +0200)]
Revert "Maybe fix failing build on OS X rust beta"
This reverts commit
3fb3fdc82fdf3a1ea060d51076c86c71fe1f405b.
Daniel Campoverde [alx741] [Tue, 17 May 2016 02:53:30 +0000 (21:53 -0500)]
Man pages: add cargo-search
Daniel Campoverde [alx741] [Tue, 17 May 2016 02:53:22 +0000 (21:53 -0500)]
Man pages: add cargo-publish
Daniel Campoverde [alx741] [Tue, 17 May 2016 02:53:03 +0000 (21:53 -0500)]
Man pages: add cargo-package
Daniel Campoverde [alx741] [Tue, 17 May 2016 02:52:54 +0000 (21:52 -0500)]
Man pages: add cargo-update
Daniel Campoverde [alx741] [Tue, 17 May 2016 02:52:40 +0000 (21:52 -0500)]
Man pages: add cargo-install
Daniel Campoverde [alx741] [Tue, 17 May 2016 02:52:25 +0000 (21:52 -0500)]
Man pages: add cargo-bench
Daniel Campoverde [alx741] [Tue, 17 May 2016 02:52:13 +0000 (21:52 -0500)]
Man pages: fix cargo-test
Mikkel Kroman [Tue, 17 May 2016 02:50:41 +0000 (04:50 +0200)]
Maybe fix failing build on OS X rust beta
Daniel Campoverde [alx741] [Tue, 17 May 2016 01:47:55 +0000 (20:47 -0500)]
Man pages: add cargo-test
Daniel Campoverde [alx741] [Tue, 17 May 2016 01:47:37 +0000 (20:47 -0500)]
Man pages: remove options from cargo-run
Daniel Campoverde [alx741] [Tue, 17 May 2016 01:34:04 +0000 (20:34 -0500)]
Add cargo-init reference in cargo-new
Daniel Campoverde [alx741] [Tue, 17 May 2016 01:33:55 +0000 (20:33 -0500)]
Man pages: add cargo-run
Daniel Campoverde [alx741] [Tue, 17 May 2016 01:33:43 +0000 (20:33 -0500)]
Man pages: add cargo-init
Daniel Campoverde [alx741] [Tue, 17 May 2016 01:10:08 +0000 (20:10 -0500)]
Man pages: add cargo-new
Daniel Campoverde [alx741] [Tue, 17 May 2016 00:47:05 +0000 (19:47 -0500)]
Man pages: add cargo-doc
Daniel Campoverde [alx741] [Tue, 17 May 2016 00:35:02 +0000 (19:35 -0500)]
Man pages: add cargo-clean
Daniel Campoverde [alx741] [Tue, 17 May 2016 00:34:40 +0000 (19:34 -0500)]
Man pages: Improve cargo-build description
bors [Tue, 17 May 2016 00:11:58 +0000 (17:11 -0700)]
Auto merge of #2696 - sbeckeriv:an-author-by-another-name-1213, r=alexcrichton
An author by another name
Dearest Reviewer
This is to support environment variables for name and email more like
git. This closes #1213 . I did look in to using libgit2 but I did not
see a clear way to get the author ident. This just moves from or_else
chaining to map_filter with env checks and getting the nth(0) result.
The docs I found
https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables#Committing
do not really indicate an order of preference to the variables. I am
more then happy to rearrange the arrays in anyway.
I also did not add in a new test for the positive case because the
test for the current variables cover that path.
Thanks for reviewing,
Becker
Stephen Becker IV [Mon, 16 May 2016 05:44:30 +0000 (22:44 -0700)]
An author by another name
Dearest Reviewer
This is to support environment variables for name and email more like
git. This closes #1213 . I did look in to using libgit2 but I did not
see a clear way to get the author ident. This just moves from or_else
chaining to map_filter with env checks and getting the nth(0) result.
The docs I found
https://git-scm.com/book/en/v2/Git-Internals-Environment-Variables#Committing
do not really indicate an order of preference to the variables. I am
more then happy to rearrange the arrays in anyway.
Thanks for reviewing,
Becker
Daniel Campoverde [alx741] [Mon, 16 May 2016 23:47:55 +0000 (18:47 -0500)]
Use dedicated directory for man pages
bors [Mon, 16 May 2016 20:29:00 +0000 (13:29 -0700)]
Auto merge of #2701 - alexcrichton:target-no-dylib, r=brson
Return a normal error if dylibs aren't supported
Rebasing of https://github.com/rust-lang/cargo/pull/2437 with a few comments addressed
Closes https://github.com/rust-lang/cargo/issues/2427
Mikkel Kroman [Mon, 16 May 2016 19:35:01 +0000 (21:35 +0200)]
Add missing newline in test output
Mikkel Kroman [Mon, 16 May 2016 18:56:40 +0000 (20:56 +0200)]
Change `cargo test --doc` test to match stdout
Alex Crichton [Mon, 16 May 2016 18:09:52 +0000 (11:09 -0700)]
Fix relative `build.target-dir` configuration
Closes #2700
Alex Crichton [Mon, 16 May 2016 17:42:29 +0000 (10:42 -0700)]
Touch up the error message and warnings
Alex Crichton [Mon, 16 May 2016 17:38:36 +0000 (10:38 -0700)]
Merge branch 'issue-2427' of https://github.com/jespino/cargo into target-no-dylib
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:39:40 +0000 (10:39 -0400)]
Clarify statements about ignoring/checking in Cargo.lock
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:30:40 +0000 (10:30 -0400)]
Small rewordings
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:28:40 +0000 (10:28 -0400)]
Clarify that you should not manually edit Cargo.lock
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:27:40 +0000 (10:27 -0400)]
Add an ascii directory tree to the project layout section
Carol (Nichols || Goulding) [Sun, 15 May 2016 14:19:13 +0000 (10:19 -0400)]
Clarify that integration tests go in tests/
"External" is a bit confusing. Then if we say where integration tests
go, that might make someone wonder where the unit tests go, so I added a
note about unit tests.
bors [Sun, 15 May 2016 01:43:48 +0000 (18:43 -0700)]
Auto merge of #2691 - serprex:master, r=alexcrichton
Remove dependency on time in favor of std::time
bors [Sun, 15 May 2016 01:08:35 +0000 (18:08 -0700)]
Auto merge of #2690 - hatsunearu:hatsunearu-patch-1, r=alexcrichton
Update manpage with some missing cargo commands
the manpage of cargo is missing a few important cargo commands, and I've added `rustc` and `help`. Hopefully everything's alright.
bors [Sun, 15 May 2016 00:29:02 +0000 (17:29 -0700)]
Auto merge of #2676 - srinivasreddy:refactor, r=alexcrichton
remove sleep_ms and change it to sleep
Carol (Nichols || Goulding) [Sat, 14 May 2016 21:16:42 +0000 (17:16 -0400)]
Reword note about git init default to be in the positive
Carol (Nichols || Goulding) [Sat, 14 May 2016 14:17:43 +0000 (10:17 -0400)]
Remove section about converting a project to cargo
Since most projects start with cargo these days.
Demur Rumed [Sat, 14 May 2016 14:08:48 +0000 (14:08 +0000)]
Remove dependency on time in favor of std::time
Carol (Nichols || Goulding) [Sat, 14 May 2016 00:05:38 +0000 (20:05 -0400)]
Replace references to conduit(-static) with uuid/rand
Since they're official rust crates.
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:56:54 +0000 (19:56 -0400)]
Combine related thoughts into the same paragraph
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:56:11 +0000 (19:56 -0400)]
Reword to not call a non-rust-tuple thing a tuple
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:55:07 +0000 (19:55 -0400)]
Use — instead of --
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:54:36 +0000 (19:54 -0400)]
Use code formatting for `git`
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:53:19 +0000 (19:53 -0400)]
Add all three channels to the sample .travis.yml
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:50:33 +0000 (19:50 -0400)]
Replace refs to color-rs crate to rust-lang's rand crate
Bonus: rand has a `next` branch so the git branch example makes more
sense!
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:42:40 +0000 (19:42 -0400)]
Clarify that release builds go in the release dir, not another subdir
Good call @steveklabnik! This matches much more nicely with the contrast
to `target/debug`.
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:42:01 +0000 (19:42 -0400)]
Link crates.io everywhere
Carol (Nichols || Goulding) [Fri, 13 May 2016 23:40:53 +0000 (19:40 -0400)]
Fix markdown links that repeat their link text unnecessarily
hatsunearu [Fri, 13 May 2016 22:37:01 +0000 (15:37 -0700)]
Update manpage with some missing cargo commands
Carol (Nichols || Goulding) [Fri, 13 May 2016 20:47:11 +0000 (16:47 -0400)]
Add instructions for rendering docs locally to the README
Carol (Nichols || Goulding) [Fri, 13 May 2016 20:09:02 +0000 (16:09 -0400)]
Make the crates.io docs about publishing only, not using
Try to make this flow a bit more and have sections based on what
situation you might find yourself in.
Carol (Nichols || Goulding) [Fri, 13 May 2016 19:13:36 +0000 (15:13 -0400)]
Consolidate all info about specifying deps into one page.
I think information about specifying dependencies deserves to have its
own page since this info is commonly needed and there are a LOT of
different ways to specify dependencies.
Previously this information was spread across multiple pages, now
there's one place to go if you're looking for any of these ways, rather
than checking the multiple pages this info was spread across before.
Carol (Nichols || Goulding) [Fri, 13 May 2016 18:16:39 +0000 (14:16 -0400)]
Incorporate "using crates from crates.io" into the main guide
Connects to rust-lang/cargo#1035. Using crates from crates.io is a
common thing that many people will want to know how to do right away and
deserves to be part of the main guide.